filechooserwidget: Inline fuction into only caller

diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 3347ede9ca265ca34b021b2d46ce4a98fbcd2742..30390078598d0917a99627f698531761c9fa8ce4 100644 (file)
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -714,12 +714,26 @@ gtk_file_chooser_widget_finalize (GObject *object)
   G_OBJECT_CLASS (gtk_file_chooser_widget_parent_class)->finalize (object);
 }
 
-/* Shows an error dialog set as transient for the specified window */
+/* Returns a toplevel GtkWindow, or NULL if none */
+static GtkWindow *
+get_toplevel (GtkWidget *widget)
+{
+  GtkWidget *toplevel;
+
+  toplevel = gtk_widget_get_toplevel (widget);
+  if (!gtk_widget_is_toplevel (toplevel))
+    return NULL;
+  else
+    return GTK_WINDOW (toplevel);
+}
+
+/* Shows an error dialog for the file chooser */
 static void
-error_message_with_parent (GtkWindow  *parent,
-                           const char *msg,
-                           const char *detail)
+error_message (GtkFileChooserWidget *impl,
+               const char            *msg,
+               const char            *detail)
 {
+  GtkWindow *parent = get_toplevel (GTK_WIDGET (impl));
   GtkWidget *dialog;
 
   dialog = gtk_message_dialog_new (parent,
@@ -737,28 +751,7 @@ error_message_with_parent (GtkWindow  *parent,
 
   gtk_dialog_run (GTK_DIALOG (dialog));
   gtk_widget_destroy (dialog);
-}
 
-/* Returns a toplevel GtkWindow, or NULL if none */
-static GtkWindow *
-get_toplevel (GtkWidget *widget)
-{
-  GtkWidget *toplevel;
-
-  toplevel = gtk_widget_get_toplevel (widget);
-  if (!gtk_widget_is_toplevel (toplevel))
-    return NULL;
-  else
-    return GTK_WINDOW (toplevel);
-}
-
-/* Shows an error dialog for the file chooser */
-static void
-error_message (GtkFileChooserWidget *impl,
-               const char            *msg,
-               const char            *detail)
-{
-  error_message_with_parent (get_toplevel (GTK_WIDGET (impl)), msg, detail);
 }
 
 /* Shows a simple error dialog relative to a path.  Frees the GError as well. */